From 20c29ef7d36a4aad0facf6eeaaa490887ecda06f Mon Sep 17 00:00:00 2001 From: Zhou Peng Date: Fri, 20 May 2011 16:11:13 +0100 Subject: [PATCH] libxl: make it possible to disable vnc tools/libxl/libxl__build_device_model_args_new/old: The condition is so rigorous that user has no chance to disable the vnc, considering what has been done in parse_config_data() by default, which is not resonable with vnc option in vm-cfg file. I think, If user explicitly set "vnc=0", vnc should be disabled. User should have the chance to only use sdl, other remote display(spice) and even nothing. Signed-off-by: Zhou Peng Acked-by: Stefano Stabellini Acked-by: Ian Jackson Signed-off-by: Ian Jackson --- tools/libxl/libxl_dm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index f90c1f372a..952cb7d001 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -97,7 +97,7 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, if (info->dom_name) flexarray_vappend(dm_args, "-domain-name", info->dom_name, NULL); - if (info->vnc || info->vncdisplay || info->vnclisten || info->vncunused) { + if (info->vnc) { char *vncarg; if (info->vncdisplay) { if (info->vnclisten && strchr(info->vnclisten, ':') == NULL) { @@ -252,7 +252,7 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, if (info->dom_name) { flexarray_vappend(dm_args, "-name", info->dom_name, NULL); } - if (info->vnc || info->vncdisplay || info->vnclisten || info->vncunused) { + if (info->vnc) { int display = 0; const char *listen = "127.0.0.1"; -- 2.30.2